From 8f92ba9b29379f1b2764cebf153996bacded62bc Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Fri, 18 Jul 2008 01:31:18 +0000 Subject: [PATCH] Change various uses of GROUP BY 1,2,3 and similar to use the actual column names. This is more familiar and readable. Also, MSSQL apparently doesn't support the numeric syntax. See discussion at bug 9767. This should cause no functional changes. If it does, revert. --- includes/specials/SpecialFewestrevisions.php | 2 +- includes/specials/SpecialMostcategories.php | 2 +- includes/specials/SpecialMostimages.php | 2 +- includes/specials/SpecialMostlinked.php | 2 +- includes/specials/SpecialMostlinkedcategories.php | 2 +- includes/specials/SpecialMostlinkedtemplates.php | 2 +- includes/specials/SpecialMostrevisions.php | 2 +- includes/specials/SpecialWantedcategories.php | 2 +- includes/specials/SpecialWantedpages.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/includes/specials/SpecialFewestrevisions.php b/includes/specials/SpecialFewestrevisions.php index fb23bb94e8..afd5ad48a5 100644 --- a/includes/specials/SpecialFewestrevisions.php +++ b/includes/specials/SpecialFewestrevisions.php @@ -36,7 +36,7 @@ class FewestrevisionsPage extends QueryPage { FROM $revision JOIN $page ON page_id = rev_page WHERE page_namespace = " . NS_MAIN . " - GROUP BY 1,2,3,4 + GROUP BY page_namespace, page_title, page_is_redirect HAVING COUNT(*) > 1"; // ^^^ This was probably here to weed out redirects. // Since we mark them as such now, it might be diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php index 5df9c861b4..e6810999b5 100644 --- a/includes/specials/SpecialMostcategories.php +++ b/includes/specials/SpecialMostcategories.php @@ -31,7 +31,7 @@ class MostcategoriesPage extends QueryPage { FROM $categorylinks LEFT JOIN $page ON cl_from = page_id WHERE page_namespace = " . NS_MAIN . " - GROUP BY 1,2,3 + GROUP BY page_namespace, page_title HAVING COUNT(*) > 1 "; } diff --git a/includes/specials/SpecialMostimages.php b/includes/specials/SpecialMostimages.php index 2fed0bd1ae..6cfeb7adce 100644 --- a/includes/specials/SpecialMostimages.php +++ b/includes/specials/SpecialMostimages.php @@ -29,7 +29,7 @@ class MostimagesPage extends ImageQueryPage { il_to as title, COUNT(*) as value FROM $imagelinks - GROUP BY 1,2,3 + GROUP BY il_to HAVING COUNT(*) > 1 "; } diff --git a/includes/specials/SpecialMostlinked.php b/includes/specials/SpecialMostlinked.php index a56ac26941..078489bd13 100644 --- a/includes/specials/SpecialMostlinked.php +++ b/includes/specials/SpecialMostlinked.php @@ -36,7 +36,7 @@ class MostlinkedPage extends QueryPage { page_namespace FROM $pagelinks LEFT JOIN $page ON pl_namespace=page_namespace AND pl_title=page_title - GROUP BY 1,2,3,5 + GROUP BY pl_namespace, pl_title, page_namespace HAVING COUNT(*) > 1"; } diff --git a/includes/specials/SpecialMostlinkedcategories.php b/includes/specials/SpecialMostlinkedcategories.php index 1b66d48403..ab250675bc 100644 --- a/includes/specials/SpecialMostlinkedcategories.php +++ b/includes/specials/SpecialMostlinkedcategories.php @@ -31,7 +31,7 @@ class MostlinkedCategoriesPage extends QueryPage { cl_to as title, COUNT(*) as value FROM $categorylinks - GROUP BY 1,2,3 + GROUP BY cl_to "; } diff --git a/includes/specials/SpecialMostlinkedtemplates.php b/includes/specials/SpecialMostlinkedtemplates.php index b8d47e6d22..d597a4e005 100644 --- a/includes/specials/SpecialMostlinkedtemplates.php +++ b/includes/specials/SpecialMostlinkedtemplates.php @@ -64,7 +64,7 @@ class SpecialMostlinkedtemplates extends QueryPage { COUNT(*) AS value FROM {$templatelinks} WHERE tl_namespace = " . NS_TEMPLATE . " - GROUP BY 1, 2, 3"; + GROUP BY tl_title"; } /** diff --git a/includes/specials/SpecialMostrevisions.php b/includes/specials/SpecialMostrevisions.php index 001a08b1d1..f5a0f8c0d1 100644 --- a/includes/specials/SpecialMostrevisions.php +++ b/includes/specials/SpecialMostrevisions.php @@ -31,7 +31,7 @@ class MostrevisionsPage extends QueryPage { FROM $revision JOIN $page ON page_id = rev_page WHERE page_namespace = " . NS_MAIN . " - GROUP BY 1,2,3 + GROUP BY page_namespace, page_title HAVING COUNT(*) > 1 "; } diff --git a/includes/specials/SpecialWantedcategories.php b/includes/specials/SpecialWantedcategories.php index 969a8d8184..7497f9be47 100644 --- a/includes/specials/SpecialWantedcategories.php +++ b/includes/specials/SpecialWantedcategories.php @@ -41,7 +41,7 @@ class WantedCategoriesPage extends QueryPage { FROM $categorylinks LEFT JOIN $page ON cl_to = page_title AND page_namespace = ". NS_CATEGORY ." WHERE page_title IS NULL - GROUP BY 1,2,3 + GROUP BY cl_to "; } diff --git a/includes/specials/SpecialWantedpages.php b/includes/specials/SpecialWantedpages.php index 650e04f912..1013340995 100644 --- a/includes/specials/SpecialWantedpages.php +++ b/includes/specials/SpecialWantedpages.php @@ -44,7 +44,7 @@ class WantedPagesPage extends QueryPage { WHERE pg1.page_namespace IS NULL AND pl_namespace NOT IN ( 2, 3 ) AND pg2.page_namespace != 8 - GROUP BY 1,2,3 + GROUP BY pl_namespace, pl_title HAVING COUNT(*) > $count"; } -- 2.20.1